Remove deadwood code.

Remove deadwood code.

diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c
index f5c7b8c1227cbefda5055410c9a1909a79e6757a..99d158f749c5721129cb18ca69b8cfc67f417ede 100644 (file)
--- a/gdk/linux-fb/gdkdrawable-fb2.c
+++ b/gdk/linux-fb/gdkdrawable-fb2.c
@@ -831,6 +831,7 @@ gdk_fb_draw_rectangle (GdkDrawable    *drawable,
 
   if(filled)
     {
+#if 0
       static volatile int print_rect = 0;
 
       if(print_rect)
@@ -839,6 +840,7 @@ gdk_fb_draw_rectangle (GdkDrawable    *drawable,
          if(y < 0)
            G_BREAKPOINT();
        }
+#endif
 
       rect.x = x;
       rect.y = y;

diff --git a/gdk/linux-fb/gdkinput.c b/gdk/linux-fb/gdkinput.c
index 2013ea07c8383293f261300782078ff5c8f2e4bb..c70de7023e40082013164d1c658a376456a6a89c 100644 (file)
--- a/gdk/linux-fb/gdkinput.c
+++ b/gdk/linux-fb/gdkinput.c
@@ -241,9 +241,6 @@ gdk_input_exit (void)
          gdk_input_set_mode(gdkdev->info.deviceid,GDK_MODE_DISABLED);
 
          g_free(gdkdev->info.name);
-#ifndef XINPUT_NONE      
-         g_free(gdkdev->axes);
-#endif   
          g_free(gdkdev->info.axes);
          g_free(gdkdev->info.keys);
          g_free(gdkdev);

diff --git a/gdk/linux-fb/gdkinputprivate.h b/gdk/linux-fb/gdkinputprivate.h
index d9ce74fdf95ba79299d8fea872b72815209bb7be..1857a34317fcd066e7e990ca5d12098ed810c5ae 100644 (file)
--- a/gdk/linux-fb/gdkinputprivate.h
+++ b/gdk/linux-fb/gdkinputprivate.h
@@ -96,34 +96,6 @@ struct _GdkAxisInfo
 
 struct _GdkDevicePrivate {
   GdkDeviceInfo  info;
-
-#ifndef XINPUT_NONE
-  /* information about the axes */
-  GdkAxisInfo *axes;
-
-  /* reverse lookup on axis use type */
-  gint axis_for_use[GDK_AXIS_LAST];
-  
-  /* Information about XInput device */
-  XDevice       *xdevice;
-
-  /* minimum key code for device */
-  gint min_keycode;           
-
-  int buttonpress_type, buttonrelease_type, keypress_type,
-      keyrelease_type, motionnotify_type, proximityin_type, 
-      proximityout_type, changenotify_type;
-
-  /* true if we need to select a different set of events, but
-     can't because this is the core pointer */
-  gint needs_update;
-
-  /* Mask of buttons (used for button grabs) */
-  gint button_state;
-
-  /* true if we've claimed the device as active. (used only for XINPUT_GXI) */
-  gint claimed;
-#endif /* !XINPUT_NONE */
 };
 
 struct _GdkInputWindow
@@ -170,50 +142,6 @@ gint               gdk_input_enable_window  (GdkWindow        *window,
 gint               gdk_input_disable_window (GdkWindow        *window,
                                             GdkDevicePrivate *gdkdev);
 
-#ifndef XINPUT_NONE
-
-#define GDK_MAX_DEVICE_CLASSES 13
-
-gint           gdk_input_common_init                (gint              include_core);
-void           gdk_input_get_root_relative_geometry (Display          *dpy,
-                                                    Window            w,
-                                                    int              *x_ret,
-                                                    int              *y_ret,
-                                                    int              *width_ret,
-                                                    int              *height_ret);
-void           gdk_input_common_find_events         (GdkWindow        *window,
-                                                    GdkDevicePrivate *gdkdev,
-                                                    gint              mask,
-                                                    XEventClass      *classes,
-                                                    int              *num_classes);
-void           gdk_input_common_select_events       (GdkWindow        *window,
-                                                    GdkDevicePrivate *gdkdev);
-gint           gdk_input_common_other_event         (GdkEvent         *event,
-                                                    XEvent           *xevent,
-                                                    GdkInputWindow   *input_window,
-                                                    GdkDevicePrivate *gdkdev);
-void           gdk_input_common_get_pointer         (GdkWindow        *window,
-                                                    guint32           deviceid,
-                                                    gdouble          *x,
-                                                    gdouble          *y,
-                                                    gdouble          *pressure,
-                                                    gdouble          *xtilt,
-                                                    gdouble          *ytilt,
-                                                    GdkModifierType  *mask);
-void           gdk_input_common_set_key             (guint32           deviceid,
-                                                    guint             index,
-                                                    guint             keyval,
-                                                    GdkModifierType   modifiers);
-void           gdk_input_common_set_axes            (guint32           deviceid,
-                                                    GdkAxisUse       *axes);
-GdkTimeCoord * gdk_input_common_motion_events       (GdkWindow        *window,
-                                                    guint32           deviceid,
-                                                    guint32           start,
-                                                    guint32           stop,
-                                                    gint             *nevents_return);
-
-#endif /* !XINPUT_NONE */
-
 GdkDevicePrivate *gdk_input_find_device (guint32 id);
 GdkInputWindow *gdk_input_window_find (GdkWindow *window);
 void gdk_input_window_destroy (GdkWindow *window);

diff --git a/gdk/linux-fb/gdkmain-fb.c b/gdk/linux-fb/gdkmain-fb.c
index 5fd7bb88007c9ece60b165195f40268c7295245a..3f8ca53ec78323d44d01b3d3a5ec302568ba773e 100644 (file)
--- a/gdk/linux-fb/gdkmain-fb.c
+++ b/gdk/linux-fb/gdkmain-fb.c
@@ -40,17 +40,6 @@
 #include "gdkprivate-fb.h"
 #include "gdkinternals.h"
 
-/* 
- * Private function declarations
- */
-
-#ifndef HAVE_XCONVERTCASE
-static void     gdkx_XConvertCase      (KeySym        symbol,
-                                        KeySym       *lower,
-                                        KeySym       *upper);
-#define XConvertCase gdkx_XConvertCase
-#endif
-
 /* Private variable declarations
  */
 static int gdk_initialized = 0;                            /* 1 if the library is initialized,